Merge "Minor Bug Fixes"