More random tweaks