Fix Pandaw's edits