Small fixes and updates