Fixes for #196 & #197