fixes for ECLIPSE-1073 and ECLIPSE-1074