Build fixes, TODOs addressed.