Add remaining changes for #246
3 files changed