Fixed a few misc defects