Quick fixes and enhancements