Small fixes for compilation process :)