Improved build with alternative compilers.
Cleaned up changes in last commit.