Bug fixex for compatility of compiler error/warning levels