Fixes for signatures