Steampunk and small build fix