CON-Venus | Fixes after merge