Fixes and memory benchmark