Minor build settings changes
Signed-off-by:Nathan2055 <spychicken2055@gmail.com>
Merge master into assets