Oops, good catches! I'm piggy backing another PR to get these changes in.