Fixes here and there