expando and goatong fixes