Fix self-forking issues

Fix self-forking issues, caused by minimum proof-of-stake calculation