Fixes a few annoyances