Small clean up fixes