Tiny fixes here and there