A few Fixes