Fixes on some class methods