Phew! Fixing album validation corner cases