Add multiple fixes made awhile ago