Misc updated sources