Several fixes and updates
Missed from previous commit