Fix problems when moving between different partitions