Fixing internal method calls