More shelf fixes