Created by: ikedas
Adding some missing things to PR #840. This PR is mostly cosmetic and will be committed soon.