Some require() fixes