Scott fixes