Fixed compilation errors, proceeding with changes