Fixed some issue (improved when doing a compile of a larger codebase)