Minor fixes and benchmark