Bug fixes. All unit tests passing