Fixing compile problems