Fix missing stuff from master