S2 CF19 Bugfixes

https://vinsol.atlassian.net/browse/CF-19