Fix some gem build errors