more class tweaks for FTS