Updates to fix building on 4.5, by removing 4.0 target