Fixes, minor updates.