Resolved bugs in compilation procedure that crept in because I didn't make clean for a while.