Fixing compilation issues...