Small fixes to the new method