Fix adding/removing partitions/oss