Fix problems and success calls