Fixes and sorting