Fix Multiple issues

Credits: CM