Small Layer improvements