Minor changes before upload to demo server