Fix some TODOs (provide better error messages)