Component portlet fixes