Bug fixes, fully offline