Fixed method calls etc