minor fixes to 54582d89d2