Require setup tweaked, fixes #3, #4, #5