Bug fixes found in response to feedback by Trampas