Fixing more position stuff