Mostly fix compile; it fails on link now.