Fixing compile issues...