Several fixes and updates