Fixes. Finish up