Cod tweaks