Some fixes, most things should work now