Fixed regression failures and warnings