Album and artist classes fixed