fixes for integration of recent pull requests

minor changes to get things working on the production server