more 1PC compat code changes
more 1PC compat fixes