signature fixes for #270