Minor optimizations
Merge branch 'master' into website