Fixing some Hybrid Core 1.6 issues