Small bits of clean up