Re-apply fixes