Parameterize more. Fixes for resource FOXs.