Additional fixes for OverDrive Module