fixing quirks while running on native