Fix Some Issues due last update