[ALOY-1054] resolve compile errors on OS X
Merge pull request #462 from skypanther/ALOY-1054b

[ALOY-1054] resolve compile errors on OS X
[ALOY-1060] Remove depdendency on is
Merge pull request #463 from skypanther/ALOY-1060

[ALOY-1060] Remove depdendency on is