Magic number tweaks