tweaks to reduce warnings