Add some regular fixes and updates