small bugfixes that resolve signal instabilities where needed