Fix some things found in practice.