Re-apply some fixes