Merge "minor bug fixes"