add forwarder fixes and remove unneccesary ndk fixes