Bootstrap Fixes