Fix some stuff.
Cont'd.