Minor fixes after testing.