Fixes with margin