Changed a few more x2 style problems