Little fixes and enhancements