More 4.x fixes