Small fixies after testing.