Minor Fixes (Preplay)