Internal fixes with issues and re-arrangements with constants