FIX: Cleaner signals