Merge

Merged Mayu's fixes.