Fixed compilation isssues