Last fixes and stuff for now