GTNPORTAL-3161 Minor fixes for 508