Fixed Some Issues Detected ...