fixes more cms 2.4 stuff