Amsterdam program fixes