Additional fixes for issue 6606