Fixes and first bootstrap script