Fixing some dingus ordering mistakes