Fix import and saving