[RFC] make files in os almost pass clint