508 fixes for wsrp admin