Multi-bullet fixes