Fix first pass errors