fixed more build-breaking bugs.