Fix some 500's