Fixed compilation errors and added SOTA to master