Warning foo and other tweaks.