o Small fixes