Yesterday
More dumb fixes