hard coded overwrite fixes