Fix the compiling commands to suit it more to our context