fix various 500's