VARIOUS FIXES [jh]