7.x fixes