patmos: getting rid of some errors
Merge branch 'sc'