Minor clean up from merge