Initial fix for broken things

ping @arekkas @BrunoSpy @ocramius

Let's think about this.