Fixed Sourcing

Fixed some more sourcing problems.