Some Quick Fixes