AI-593 Fixes build