Finishing up Small Fixes