Build: Fixed some problems.