Asset Pipeline - Fixing a couple of bad asset issues.

Fixes #1966