Fix final build errors