Make scripts deferred - fixes #7