Make internal units consistent