added some missed changes