Fixing some TODO