MINOR fixes for @Calclavia