Small changes so we can run programs