Fixed explosions in build