Tiny fixes. #932