bug fixes for ontescomplete