few Portland updates/fixes