Fixed More Issues