Fix #1409, fix #1467
Fix #1409, fix #1467

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