Fixing more stuff