Changed return values of a couple of methods to fix bugs