Addressing issues in previous build.