Random Minor Fixes