Slightly reduced build size