Fixes to album gathering