Re-apply fixes I stomped all over