Fixes for #119, #200, #201 & #204