Last week fixes