Fixup some source parameter calculations