Fix More Issues