Bootstrap: require and small corrections