Border fixing

More border fixing.