Again more fixes