Fix some stupidness