PROBCORE-626 Implemented some small fixes/small API changes