[fix] Make it build with EST flags consistently