bugfixes to catkinization