Fix auth and other things