Small portal fixes: swc-903, swc-896, swc-914, swc-468, swc-916, swc-924, swc-925, swc-926, swc-930