small fixes based on library persistence fix