updated for errors re: 0.6.0 merge and bootstrap