add fixes recommended in forum threads