Class fixes