Fixes / Additional Settings