rebuild all; fix build solution