tempfix

contains package fixes intended to be migrated to the original package at some point.