A few fixes, disable accounts...
Merge branches