Fixed some issues with hardcoded versions