Adding a few quick bug fixes.