Bootstrap: some fixes and added macro specs