Fixes for three of Bytram's issues

Fixes for #311, #312, #313