Fixes for non-django deploymnet.