Fixed Source Issues