Fix some build elements