Random fixes
Increase state expire window
Merge branch 'master' of git.confine-project.eu:confine/controller