catkinizing, bugfixing for libs