Fix compiler errors
Some unspecific changes