Fixed ordering and a regex oops