Try to make this compile out of the box a bit better..