Small fixes!