Code review changes - only small basic warnings.