Add TODOs and FIXMEs for future maintenance