cleanup some signature issues