Bugfix/integration issues

@effkay FYI, added a couple of fixes for isses we encountered while integrating with our first site.