Fix minor issues when using the force flag.