Update spec to current, fix C warnings