Fix up some more sign problems