Fixing broken public methods;