Bug fixes (should fix out of memory error).