Updates and fixes.