Some fixes (I hope) build 0.2013120321