Small fixes per ffurrer's code review