Minor changes

Small post-refactor fixes and changes...