bug fixes in bootstrap module