Fixes and minor updates.