POC fixes

@MatthiasBrantner @dknochen I believe master is broken at the moment (that's the downside of having the backend deployed independently I assume). Not sure how to fix yet. Will investigate it offline with either one of you.