Nulling static instance & more.

I was just looking at the source, And I thought you should really fix these.