Fix build Errors