Add minor changes to current source