Fixed method return values