some standard fixes