bugfixes

Fixes ssr105 and ssr109 bugs