Fixed some stuff breaking from version control