Makedah, good links!
As you said, Shrugs & Upright Rows are good. You can also do your Upright Rows with a straight bar on a Cable station instead of dumbells.
Shrugs on a calf machine
Deadlifts
Power Cleans
Hang Cleans
Snatch
And remember, dont roll your shoulders when doing shrugs!