Fixed PIEAE from quickfixes.
(cherry picked from commit f3cdc85)
Fixed SbtSettings conflict.
(cherry picked from commit 3d5adb3)