Miscellaneous class tweaks and enhancements