Static access. Minor adjustments and fixes.