More updates
merge fixes