Patched everything so it should compile