More Quick Fixes