Fixes for #178 & #198