misc tramp fixes