Fixed compilation errors (cont.)