Additional Fixes