Some Additional Fixes from me