Fix bootstrap issues