Changes necessary to use cjs instead of gjs