Minor acrobatics fixes