Small fixes to merge in updates