more fixes defaults