Some fixes and updates.