More fixes from Genesis 2.1.2