Fix sneaky bugs.