fixes

Small fixes here and there.