Few little fixes based on unit test results