Quick minor fixes