Fixed Geo's warnings.