Solve some compilation bugs.