small updates to fix build problems