A couple of 1.x fixes