a few more forceful fixesx