Small fixes before compilation process :)