Current changes and fixes.