New URLs for streams and for PSD.
(some small adjustments for Xcode 5 compatibility)