Fixes and more.