Finishing the Fixes