Fixed issues detected during testing.