perf fixes
Merge pull request #55 from webconvforge/perf

Minor perf fixes