commit 17 - fixes to deal with bootstrap changes.