Additional bugfixes for availability data