Resolved some warnings not produced by g++