Fix warning and convert to arc