FIX: bring in commit again for quick minor fixes