Bugfixes for fixes in missing macro