DB and album fixes