Update that stuff before merge with master