Merge "Bugfix: fix two typos"