Fixed some ordering stuff