some friday fixes