Fix signatures