Fixes for miscellaneous failing tests