Improve const rules and others