Fixes discovered in TCK testing