Finishing Fixes