Some fixes of current issues