Pushing fixes from Tomohiro