Remove some warnings, clean up static-ness