Various fixes and updates
Various fixes and updates