Fixed compilation errors in last 2 commits