Further Fixes