Fixes build problems. Still some cruft left. bjmcmorran