More gallery fixes