Fixes id type handling.