Hopefully fixed 0.8 issues