Loading performance

Fixes for issue #157