Fix some minor nits that were bugging me.