Minor updates prior to merge