Minor clean up and fixes.