Fix errors, cherry picked make format fixes