Some minor classes updates