Bootstrap to foundation fixes