More fixes for stupid git-shit
More fixes