clean up/update ffcompat (identical to other projects)