AttemptController fixes