Completed Fixes