correct oversights in previous commit