Few fixes here and there