Add type filters
Fix signal-slot warnings