Fixes compile and ordering