Update src, fix build