Minor fixes / enhancements.