continuing fixes in catkinzation