Lion compat

Pls to accept, and also merge your allArguments stuff in.