* Fix a couple of const, static and other warnings