bootstrap-related fixes for 1.3.6