Release candidate 0.8.1 beta 2

Some minor fixes