Updates, fixes all around