Dynamic support fixes