Fixed a few ordering Issues