fixes after some git nonsense