Fixes for issues #182 & #178