Make a few things explicit