misc storm fixes