Moar fixes, still not compiling