Some 1.5.1 and other fixes.
Merge pull request #123 from smigolpol/master

Updated machines for 1.5.1.