Fix Album stuff