Fix ambiguous method call errors