Fixed soundcloud changes from master