Fix #1498, #1816
Fix #1498, #1816

mkeilman/sirepo,mkeilman/sirepo,mkeilman/sirepo,mrakitin/sirepo,mrakitin/sirepo,mrakitin/sirepo,mrakitin/sirepo,radiasoft/sirepo,radiasoft/sirepo,radiasoft/sirepo,radiasoft/sirepo,radiasoft/sirepo,mkeilman/sirepo