Bootstrap fix

Fixes bootstrap issues