Various fixes according to TPWD feedback