Fixes here and there...