Fixed border problems