Fix ordering woes