Improve error reporting, more id fixes