Today's fixes :)