Some more fixed with KDev 4.5