Fixed bugs according to #1223 and 1226

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