Minor fixes, software collection support