Bootstrap fixes, closes #1030, #1036, #1048.