LRA-189 

Bug fixes found while loading the portlet first time