Fix some warnings
Small sorting issue