"Bug CON-68" fixes