Small fixes, reverts.