Fixes including provisional fix for #200