Fix Some Issues (hopefully)