Partial fixes for tck build and tests