Software version check fixes