General Fix

Generel Fixes;