Various fixes by SoundCloud