Code lint fixes for build