Updates after the migration to Maverick