Fix TODO routes