Small fixes and updates.