More fixes for partition stuff