CON-907 | Fix some more errors