Bugfixes + iotable fix