Both issues should be resolved by Monday.