Changed a few things to remove compiler deprecation warnings.