Fixes for issues BERKEL-77,79,80