Slight tweaks