Fix some minor issues with the new methods