some useful fixes