Some fixes in class