Defines related bugfixes