Some minor tweaks.
Merge branch 'master' of github.com:slashrsm/media_austin