Fixed injection issues