Fixed wonky stuff.
Attempt to fix merge fail.