Bootstrap fixes
changes for richard