deprecation warnings, indent fix