some fixes for TCK