fixes for amsterdam