Some fixes and enhancements, nothing major