Fixed IceBlast and Lightning bugs

See individual commits for changelog