Bugfix/unforge errors

scdt unforce had some bumps in the road. This MR (new to GitLab, sounds funny) tries to attack these.

Please provide feedback for improvements if you like.