further fixes to less permissive archeteture