Fix missing handlers