More layer changes to help handle the default OSC