Fixed compilation errors - issue 3