Minor fixes and updates.