usage-tracking: incorporate review comments
Fix sandbox compilation errors