Fixed build errors, should compile now