Current system fixes
Freenet fixes