a few random quick fixes