Some misc minor fixes and such