CON-522 | Adress some changes after cr