fixes for temp and geo crash