stability fixes based on usage stats