Bug-fixes and performance