Bug fixes for viewer and soundcloud