Fix typo mistake
Improve compilation by segmenting it in steps