/* = Some Fixes
-------------------------------------------------------------- */