Fixes. Support global defaults