Nit-Pik Fixes