Fix #74 & #77 (GSetting)