* Fixes for superseded default layer functionality * Fixes for superseded default layer functionality