Fixed some firing stuff