standalone fixes