fixing tickets #688 and #949

git-svn-id: https://svn.modelica.org/projects/Modelica/trunk@5895 7ce873d0-865f-4ce7-a662-4bb36ea78beb