Fixed some injection issues