Some fixes encountered during the classs