Many fires and constructor changes.