Fixes for #89 & #113