Fixed issues with report builder API incompatibility