(workaround)-fixes and adjustments