A few updates

A couple of small updates regarding the forcing of data-types as well as handling of 1 item galleries.