misc fix
misc fix2