fixing build errors
Merge pull request #440 from rackerlabs/constanzeworking18

fixing build errors
Sync with master