Monor fixes here and there