more fixes for func signatures