Last few fixes

Everything should work now