minor drive and Serenity changes