Strict warning bug fixes