Fixed r10k bootstrap
Various bug fixes