done fixes