Minor performance improvements
Merge branch 'devel'