Fixes and Sorting