More Issues Fixed