Fixes for CON-1057 and CON-1058