Fix album issues