fix a couple of commits from yesterday that mysteriously disappeared