Bug fixes in LazyFirework