updates to compile cleanly on redhat.