Updates/Fixes for v0.7.6