Bug fixes for album rendering