More gridportal fixes