Fixes as requested by @cpeterso.