fixes on native layer