More OO tweaks