Fixing build from example issues