Fixed minor issues discovered during testing.