Fixes for stupid simple crashes: caused by a namespace var; caused by non-type template arg
Fixes for stupid simple crashes: caused by a namespace var; caused by non-type template arg

angavrilov/olmar,angavrilov/olmar,angavrilov/olmar,angavrilov/olmar