Minor fixes after the first test.