Really Great Minor Fixes