expando and goatong fixes
3.294