Fix mounting of SD card image

This one should be based on the testing branch.