Cleaned up dialyzer warnings and fixed realted errors.
Merge branch 'test' into dev
Fixed versions.