Fix two oversights.