Small Quick Fixes