Issue fixes

Fixes #454 and #323 
:+1: