Bugfixes for SNOWDROP-61 and SNOWDROP-62