Add fixes to all method.