Class fixes.