Misc updates
Fixed merge