General fixes to avoid bugs during installation from pistore