Fixes and minor updates