Fixes for 'z' signature matching commands