fix compiler warnings
re-add versions
fix compiler warnings