Minor fixes (removing TODOs and XXX)