First batch of bug fixes!