Small fixes..