Hot-fixes, updates, etc.

Merge includes bug fixes and updates.