Bootstrap fixes

Fixes #18