cleanup #2 - fixed building (so it seems)...