fixing more build errors, as one does