Fix auto-update to update more reliably
Fix grid class format