Minor signature cleanup