Fixed compilation errors and compile comands