Fixes for DEVELOPER-378