more fixes to default system