Fix bugs in storage classes