Fix storm compile bugs