CON-907 | Fix some more more more more errors
CON-907 | Fix some more more more more more errors