Yesterday's fixes :P