misc changes I forgot to check in