tweaks to allow tramp to work on edge cases