Latest fixes and updates