Amsterdam filming locations from Diamonds Are Forever

In May I was in the Netherlands for a couple of days, with slightly more than a day in Amsterdam. While there we did as much sightseeing as possible, including a couple of locations from Diamonds Are Forever.
The first locations is known in English as the Skinny Bridge, from where Wint and Kidd watch as Mrs Whistler's body is lifted out of the river Amstel.
The other is a house a couple of blocks away. Bond goes to 36 Reguliersgracht to meet Tiffancy Case. He gets there in a yellow Triumph Stag, which is also seen from the Skinny Bridge.
If you'd like to find out more about other locations from the films I recommend getting your hands on a copy of On the Tracks of 007 by Martijn Mulder and the late Dirk Kloosterboer.
You can learn more about the book at jamesbonddossier.com/tracks