Clemens-E #56: clean up some bugs