Fixed up some stuff that stopped me from building