Minor bug fixes but version does not pass integration testing