Fix issues related to Rhythm API. Closes #147