Fixed some border issues for worth remembering