Update for Nokia S40 Port to build correctly