more fixes for catkinization...