some fixes for cdk1.5