Bugfixes, bug with IDs exposed