More auto_partition LUKS bugfixes