Made handlers static, removed all warnings (for now...)