Make some adjustments to catwalks.  Fixes #402, #404.