more fixes'
gi