Kill some warnings
Spergy variable rename