Fixed stop warnings