Fixed class issues