I'll apply these fixes to the admin and docs pages as well.