Fixes for ERRAI-528