Bug Fixes for Corey.