Some fixes according subs shotgun driver