Miscellaneous fixes and enhancements

Did you mean 'merged' or 'merge'?