Changes to compilation and scripts