Some fixes
Merge pull request #1269 from Adaptivity/Update

Some fixes