couple more fixes generated in the process