v1.3.6 --

Minor tweeks needed for v1.3.6 to work in production...