Merge "Misc bug fixes"