Fixes to recent changes and WordPress planning