Fixes for all of the nits