Additional Quick Fixes