Some fixes in #class 6