Various fixes for release 0.0.24