Minor changes/updates to fix some annoyances