Fix some issues with the update to force_it