couple of forgotten fixes