clean up fixes