Honeycomb target framework fixes