Changed code to address gcc warnings.