A few bug fixing
Merge branch 'master' into remalloc/LoadBalancer