Numerous Fixes