Fixes for expiry UI