Fixes for third party components