Fixing things up a bit.. more progress to catkinization