Couple tweaks for easier usage