WL-554 and other portal fixes