Fix some project settings
Small code fixes