fixing issues related to hard coded values