Various fixes for standalone build 0.8.0