more fixes
sometimes git can be that problem child..

… that no one likes but we deal with anyway.