Generic bug fixes and enhancements