* Fixed some -Wall errors/warnings