Two updates to align with project changes

Update src, so .... it could compile and work properly.