Minor fixes and tweaks that will hopefully fix the header issue on the server.

3/21/2013