small changes to make stuff runnable out of the box