v0.36: minor cosmetic changes