Merge a few changes over from nanoreactor