Minor changes to get cpal to import