Remove (hopefully) remaining warnings.