Just Some fixes