CON-556 | Fixes after CR