Fixing more things