Build error fix